Fix merge conflict between new HVM console handling and new HVM boot handling.
authorEwan Mellor <ewan@xensource.com>
Thu, 1 Feb 2007 15:31:34 +0000 (15:31 +0000)
committerEwan Mellor <ewan@xensource.com>
Thu, 1 Feb 2007 15:31:34 +0000 (15:31 +0000)
commitf9d2dae496ea8602c3b3573e7d203eddc6decd36
tree31ab8279325e5082568e1c13ce45654ab634e248
parentd6f8b69ced6deb05dc56ad4363cfa9e55ddcd493
Fix merge conflict between new HVM console handling and new HVM boot handling.

Signed-off-by: Ewan Mellor <ewan@xensource.com>
tools/python/xen/xend/server/vfbif.py